merge with xen-ia64-unstable.hg
authorkaf24@localhost.localdomain <kaf24@localhost.localdomain>
Wed, 15 Nov 2006 00:14:41 +0000 (00:14 +0000)
committerkaf24@localhost.localdomain <kaf24@localhost.localdomain>
Wed, 15 Nov 2006 00:14:41 +0000 (00:14 +0000)

Trivial merge